extract-strings: Support more GtkBuilder markup

The inspector templates are using the <item> tag with an
id attribute, which was causing extract-strings to fail.
Fix this.

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index d5e0c32d693bd6072f29caf78dc10d8648df2100..c488aa08397a22b0939bfad1a3df473503b8d8a5 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -424,7 +424,8 @@ HTML_IMAGES = \
        $(srcdir)/images/getting-started-app9.png                       \
        $(srcdir)/images/getting-started-app10.png                      \
        $(srcdir)/images/exampleapp.png                                 \
-       $(srcdir)/images/flow-box.png
+       $(srcdir)/images/flow-box.png                                   \
+       $(srcdir)/images/inspector.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \

diff --git a/docs/reference/gtk/images/inspector.png b/docs/reference/gtk/images/inspector.png
new file mode 100644 (file)
index 0000000..0f16b21
Binary files /dev/null and b/docs/reference/gtk/images/inspector.png differ

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 05f0510472adb3fe79fa9499a9e82640e6a142b4..eff40eb5e19e429fddb3600f47520040b568f559 100644 (file)
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -194,10 +194,27 @@ additional environment variables.
       <term>no-css-cache</term>
       <listitem><para>Bypass caching for CSS style properties.</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>baselines</term>
+      <listitem><para>Baselines.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>pixel-cache</term>
+      <listitem><para>Pixel cache.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>no-pixel-cache</term>
+      <listitem><para>Disable the pixel cache.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>interactive</term>
+      <listitem><para>Open the <link linkend="interactive-debugging">interactive debugger</link>.</para></listitem>
+    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all
-  debug options.
+  debug options. The special value <literal>help</literal> can be used
+  to obtain a list of all supported debug options.
   </para>
 </formalpara>
 
@@ -509,6 +526,24 @@ nevertheless.
 
 </refsect2>
 
+<refsect2 id="interactive-debugging">
+<title>Interactive debugging</title>
+
+  <para>
+    GTK+ includes an interactive debugger which lets you explore the
+    widget tree of any GTK+ application at runtime, as well as tweak
+    the theme and trigger visual debugging aids.
+  </para>
+  <para>
+    To enable the debugger, you can use the Control-Shift-S keybinding
+    or pass set the <envar>GTK_DEBUG=interactive</envar> environment
+    variable.
+  </para>
+
+  <inlinegraphic fileref="inspector.png" format="PNG"></inlinegraphic>
+ 
+</refsect2>
+
 </refsect1>
 
 </refentry>

diff --git a/gtk/extract-strings.c b/gtk/extract-strings.c
index 759215367e10dcf1eec47c51864b6063f5ab8937..183b99a4c420285835c3d9df4175c3308596dd27 100644 (file)
--- a/gtk/extract-strings.c
+++ b/gtk/extract-strings.c
@@ -52,6 +52,7 @@ start_element_handler (GMarkupParseContext  *contexts,
                                    G_MARKUP_COLLECT_TRISTATE, "translatable", &translatable,
                                    G_MARKUP_COLLECT_STRDUP|G_MARKUP_COLLECT_OPTIONAL, "context", &context,
                                    G_MARKUP_COLLECT_STRDUP|G_MARKUP_COLLECT_OPTIONAL, "comments", &comments,
+                                   G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "id", NULL,
                                    G_MARKUP_COLLECT_INVALID);
 
       if (translatable == TRUE)